stubdom: Install and use stubdompath.sh

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/stubdom/Makefile b/stubdom/Makefile
index ace9bf7ada586485bd18a6d544d953e76cf468fa..26811943f5ab3ddf2388b4dd94f340429977e9cf 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -82,11 +82,11 @@ genpath-target = $(call buildmakevars2file,$(STUBDOMPATH))
 $(eval $(genpath-target))
 
 .PHONY: all
-all: genpath build
+all: build
 ifeq ($(STUBDOM_SUPPORTED),1)
-build: ioemu-stubdom c-stubdom pv-grub
+build: genpath ioemu-stubdom c-stubdom pv-grub
 else
-build:
+build: genpath
 endif
 
 ##############
@@ -344,9 +344,9 @@ pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxc grub
 #########
 
 ifeq ($(STUBDOM_SUPPORTED),1)
-install: install-readme install-ioemu install-grub
+install: genpath install-readme install-ioemu install-grub
 else
-install:
+install: genpath
 endif
 
 install-readme:
@@ -355,7 +355,7 @@ install-readme:
 
 install-ioemu: ioemu-stubdom
        $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
-       $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)"
+       $(INSTALL_PROG) stubdompath.sh stubdom-dm "$(DESTDIR)$(LIBEXEC)"
        $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
        $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
 

diff --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm
index b163df22224d3e2d5271a2107ff2a45d7f69a051..c138e009455b4650e1b8dd001ccd27d63cfb3cfa 100644 (file)
--- a/stubdom/stubdom-dm
+++ b/stubdom/stubdom-dm
@@ -5,8 +5,8 @@
 # dm script around stubdomains.
 #
 
-XEN_CONFIG_DIR="/etc/xen"
-XENFIRMWAREDIR="/usr/lib/xen/boot"
+DIR=`dirname $0`
+. "${DIR}/stubdompath.sh"
 stubdom_configdir="${XEN_CONFIG_DIR}/stubdoms"
 
 # To fit xterms nicely